Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add build specs for Empty and Basic Activity Android Applications and other upgrades #120

Merged
merged 17 commits into from
Oct 24, 2024

Conversation

tresat
Copy link
Member

@tresat tresat commented Sep 17, 2024

  • Adds 2 new project init specs for Empty Activity and Basic Activity Android Applications.
  • Upgrades project to use Java 17 (align with Android requirements).
  • Upgrades Kotlin version to 2.0.21 (align with Kotlin DSL in Gradle).
  • Update to use new Gradle nightly including merged Build Init Specs.
  • Various integration testing fixes and additions.
  • Updates KMP plugin to hide Polymorphic container, which is no longer supported.

@tresat tresat self-assigned this Sep 17, 2024
@tresat tresat added the enhancement New feature or request label Sep 20, 2024
@tresat tresat mentioned this pull request Sep 20, 2024
Copy link
Member

@eskatos eskatos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This overall looks good to me.
There are many pending TODOs so I don't approve right away.

@tresat
Copy link
Member Author

tresat commented Sep 26, 2024

This overall looks good to me. There are many pending TODOs so I don't approve right away.

Thanks for the review. This has to wait until the init changes on the Gradle side are finished, or at least stable enough that I can build a nightly and update the wrapper here to use it. I don't want to merge this first.

@tresat tresat force-pushed the tt/new-android-templates-from-intellij-new-project branch from 4a4287f to 08cd687 Compare September 30, 2024 15:31
@tresat tresat changed the title Add new project specs for Empty and Basic Activity Android Applications Add build specs for Empty and Basic Activity Android Applications and other upgrades Oct 24, 2024
# Conflicts:
#	unified-prototype/gradle.properties
# Conflicts:
#	unified-prototype/gradle/wrapper/gradle-wrapper.properties
# Conflicts:
#	unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/buildinit/AndroidProjectSource.java
…udio, fix testing

# Conflicts:
#	unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/jvm/buildinit/JVMProjectSource.java
#	unified-prototype/unified-plugin/plugin-kmp/src/main/java/org/gradle/api/experimental/kmp/buildinit/KMPProjectSource.java

# Conflicts:
#	unified-prototype/unified-plugin/plugin-android/src/main/resources/META-INF/services/org.gradle.buildinit.projectspecs.InitProjectSource
#	unified-prototype/unified-plugin/plugin-jvm/src/main/resources/META-INF/services/org.gradle.buildinit.projectspecs.InitProjectSource
#	unified-prototype/unified-plugin/plugin-kmp/src/main/resources/META-INF/services/org.gradle.buildinit.projectspecs.InitProjectSource
Polymorphic containers are not supported yet in DCL, so hide this one and expose the (limited) functionality of the known target platform types statically in a non-container interface.
# Conflicts:
#	unified-prototype/unified-plugin/plugin-common/src/main/java/org/gradle/api/experimental/buildinit/StaticProjectGenerator.java
#	unified-prototype/unified-plugin/plugin-common/src/main/java/org/gradle/api/experimental/buildinit/StaticProjectSpec.java
@tresat tresat force-pushed the tt/new-android-templates-from-intellij-new-project branch from 08cd687 to e001341 Compare October 24, 2024 20:29
@tresat tresat merged commit c472ed0 into main Oct 24, 2024
2 checks passed
@tresat tresat deleted the tt/new-android-templates-from-intellij-new-project branch October 24, 2024 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants